Produced by Araxis Merge on 2021-07-21 10:22:01 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_SocialFeed/templates | instagramphotos.phtml | 2021-04-13 15:52:00 +0000 |
| 2 | /Applications/Ampps/www/Porto v4.0.1/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_SocialFeed/templates | instagramphotos.phtml | 2021-07-15 03:30:02 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 168 |
| Changed | 1 | 3 |
| Inserted | 1 | 1 |
| Removed | 0 | 0 |
| Whitespace | Consecutive whitespace is treated as a single space |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
| Active line-pairing rules |
No regular expressions were active.
| 1 | <?php | 1 | <?php | |||
| 2 | $_enable = $this->getConfig('sw_socialfeeds/instagram_photos/enable'); | 2 | $_enable = $this->getConfig('sw_socialfeeds/instagram_photos/enable'); | |||
| 3 | if($_enable==1){ | 3 | if($_enable==1){ | |||
| 4 | $accesstoken = $this->getConfig('sw_socialfeeds/instagram_photos/accesstocken'); | 4 | $accesstoken = $this->getConfig('sw_socialfeeds/instagram_photos/accesstocken'); | |||
| 5 | $count = $this->getConfig('sw_socialfeeds/instagram_photos/showing_counts') + 1; | 5 | $count = $this->getConfig('sw_socialfeeds/instagram_photos/showing_counts') + 1; | |||
| 6 | $padding = $this->getData("padding_item")!=''?'padding:'.$this->getData("padding_item").';':''; | 6 | $padding = $this->getData("padding_item")!=''?'padding:'.$this->getData("padding_item").';':''; | |||
| 7 | $template_type = $this->getData("template_type"); | 7 | $template_type = $this->getData("template_type"); | |||
| 8 | $desktop_large = $this->getData("desktop_large") != '' ? $this->getData("desktop_large") : $this->getData("desktop") != '' ? $this->getData("desktop") : '6'; | |||||
| 9 | $desktop = $this->getData("desktop") !='' ? $this->getData("desktop") : '6'; | 8 | $desktop = $this->getData("desktop") !='' ? $this->getData("desktop") : '6'; | |||
| 10 | $tablet = $this->getData("tablet") != '' ? $this->getData("tablet") : '4'; | 9 | $tablet = $this->getData("tablet") != '' ? $this->getData("tablet") : '4'; | |||
| 11 | $mobile = $this->getData("mobile") != '' ? $this->getData("mobile") : '2'; | 10 | $mobile = $this->getData("mobile") != '' ? $this->getData("mobile") : '2'; | |||
| 12 | $margin = $this->getData("margin") != '' ? $this->getData("margin") : '0'; | 11 | $margin = $this->getData("margin") != '' ? $this->getData("margin") : '0'; | |||
| 12 | $desktop_large = $this->getData("desktop_large") != '' ? $this->getData("desktop_large") : $desktop; | |||||
| 13 | ?> | 13 | ?> | |||
| 14 | <div class="insta-items grid-items"> | 14 | <div class="insta-items grid-items"> | |||
| 15 | <?php if($template_type == 'carousel'):?> | 15 | <?php if($template_type == 'carousel'):?> | |||
| 16 | <div id="instafeed" class="photo-instagrams owl-carousel mb-0" style="opacity:0;"></div> | 16 | <div id="instafeed" class="photo-instagrams owl-carousel mb-0" style="opacity:0;"></div> | |||
| 17 | <?php else: ?> | 17 | <?php else: ?> | |||
| 18 | <div id="instafeed" class="photo-instagrams row" style="margin-left: -<?php echo $this->getData("padding_item"); ?>;margin-right: -<?php echo $this->getData("padding_item");?>;opacity:0;"></div> | 18 | <div id="instafeed" class="photo-instagrams row" style="margin-left: -<?php echo $this->getData("padding_item"); ?>;margin-right: -<?php echo $this->getData("padding_item");?>;opacity:0;"></div> | |||
| 19 | <?php endif;?> | 19 | <?php endif;?> | |||
| 20 | </div> | 20 | </div> | |||
| 21 | <script type="text/javascript"> | 21 | <script type="text/javascript"> | |||
| 22 | require([ | 22 | require([ | |||
| 23 | 'jquery', | 23 | 'jquery', | |||
| 24 | 'imagesloaded', | 24 | 'imagesloaded', | |||
| 25 | 'owl.carousel/owl.carousel.min' | 25 | 'owl.carousel/owl.carousel.min' | |||
| 26 | ], function ($) { | 26 | ], function ($) { | |||
| 27 | var instagram = $('#instafeed'), | 27 | var instagram = $('#instafeed'), | |||
| 28 | token = '<?php echo $accesstoken;?>', | 28 | token = '<?php echo $accesstoken;?>', | |||
| 29 | count = '<?php echo $count;?>', | 29 | count = '<?php echo $count;?>', | |||
| 30 | url = '//graph.instagram.com/me/media?fields=caption,id,media_type,media_url,permalink,thumbnail_url,timestamp,username&access_token=' + token, | 30 | url = '//graph.instagram.com/me/media?fields=caption,id,media_type,media_url,permalink,thumbnail_url,timestamp,username&access_token=' + token, | |||
| 31 | desktop_large = '<?php echo $desktop_large;?>', | 31 | desktop_large = '<?php echo $desktop_large;?>', | |||
| 32 | desktop = '<?php echo $desktop;?>', | 32 | desktop = '<?php echo $desktop;?>', | |||
| 33 | tablet = '<?php echo $tablet;?>', | 33 | tablet = '<?php echo $tablet;?>', | |||
| 34 | mobile = '<?php echo $mobile;?>', | 34 | mobile = '<?php echo $mobile;?>', | |||
| 35 | margin = <?php echo $margin;?>; | 35 | margin = <?php echo $margin;?>; | |||
| 36 | $.ajax({ | 36 | $.ajax({ | |||
| 37 | type: 'GET', | 37 | type: 'GET', | |||
| 38 | dataType: 'jsonp', | 38 | dataType: 'jsonp', | |||
| 39 | cache: false, | 39 | cache: false, | |||
| 40 | url: url, | 40 | url: url, | |||
| 41 | success: function(data) { | 41 | success: function(data) { | |||
| 42 | for (var i = 0; i < count; i++) { | 42 | for (var i = 0; i < count; i++) { | |||
| 43 | if (data.data[i]) { | 43 | if (data.data[i]) { | |||
| 44 | if(data.data[i].media_type == 'IMAGE') { | 44 | if(data.data[i].media_type == 'IMAGE') { | |||
| 45 | <?php if($template_type == 'carousel'):?> | 45 | <?php if($template_type == 'carousel'):?> | |||
| 46 | instagram.append("<div class='item insta-item' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>"); | 46 | instagram.append("<div class='item insta-item' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>"); | |||
| 47 | <?php else: ?> | 47 | <?php else: ?> | |||
| 48 | instagram.append("<div class='item insta-item item col-xl-2 col-lg-3 col-sm4 col-6' style='<?php echo $padding;?>' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>"); | 48 | instagram.append("<div class='item insta-item item col-xl-2 col-lg-3 col-sm4 col-6' style='<?php echo $padding;?>' data-date='"+data.data[i].timestamp+"' data-sortid='"+i*2+"'><a target='_blank' href='" + data.data[i].permalink +"'><span class='content'><i class='porto-icon-instagram'></i></span><img class='instagram-image' src='" + data.data[i].media_url +"' /></a></div>"); | |||
| 49 | <?php endif;?> | 49 | <?php endif;?> | |||
| 50 | } | 50 | } | |||
| 51 | } | 51 | } | |||
| 52 | } | 52 | } | |||
| 53 | instagram.imagesLoaded().animate({ 'opacity' : 1 }, 500); | 53 | instagram.imagesLoaded().animate({ 'opacity' : 1 }, 500); | |||
| 54 | <?php if($template_type == 'carousel'):?> | 54 | <?php if($template_type == 'carousel'):?> | |||
| 55 | instagram.imagesLoaded(function(){ | 55 | instagram.imagesLoaded(function(){ | |||
| 56 | instagram.owlCarousel({ | 56 | instagram.owlCarousel({ | |||
| 57 | loop: true, | 57 | loop: true, | |||
| 58 | margin: margin, | 58 | margin: margin, | |||
| 59 | responsiveClass: true, | 59 | responsiveClass: true, | |||
| 60 | nav: false, | 60 | nav: false, | |||
| 61 | autoplay: false, | 61 | autoplay: false, | |||
| 62 | autoplayTimeout: 5000, | 62 | autoplayTimeout: 5000, | |||
| 63 | dots: false, | 63 | dots: false, | |||
| 64 | lazyLoad: false, | 64 | lazyLoad: false, | |||
| 65 | responsive:{ | 65 | responsive:{ | |||
| 66 | 0:{ | 66 | 0:{ | |||
| 67 | items:mobile | 67 | items:mobile | |||
| 68 | }, | 68 | }, | |||
| 69 | 600:{ | 69 | 600:{ | |||
| 70 | items:tablet | 70 | items:tablet | |||
| 71 | }, | 71 | }, | |||
| 72 | 1000:{ | 72 | 1000:{ | |||
| 73 | items:desktop | 73 | items:desktop | |||
| 74 | }, | 74 | }, | |||
| 75 | 1400:{ | 75 | 1400:{ | |||
| 76 | items:desktop_large | 76 | items:desktop_large | |||
| 77 | } | 77 | } | |||
| 78 | } | 78 | } | |||
| 79 | }); | 79 | }); | |||
| 80 | }); | 80 | }); | |||
| 81 | <?php endif;?> | 81 | <?php endif;?> | |||
| 82 | } | 82 | } | |||
| 83 | }); | 83 | }); | |||
| 84 | }); | 84 | }); | |||
| 85 | </script> | 85 | </script> | |||
| 86 | <?php }?> | 86 | <?php }?> |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.